From 0566b679f53c6c7b5823d6c3d4008e89d0f2c650 Mon Sep 17 00:00:00 2001 From: "cl349@freefall.cl.cam.ac.uk" Date: Sun, 8 Aug 2004 08:51:25 +0000 Subject: [PATCH] bitkeeper revision 1.1159.5.1 (4115e98dPNWH4xtwe1JdP6o99WWTCQ) Always select our idle loop. --- linux-2.6.7-xen-sparse/arch/xen/i386/kernel/process.c | 3 ++- linux-2.6.7-xen-sparse/arch/xen/i386/kernel/setup.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/process.c b/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/process.c index c2642854fe..f67d8f8d91 100644 --- a/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/process.c +++ b/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/process.c @@ -193,7 +193,8 @@ void __init select_idle_routine(const struct cpuinfo_x86 *c) } return; } - pm_idle = xen_cpu_idle; + if (!pm_idle) + pm_idle = default_idle; return; } diff --git a/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/setup.c b/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/setup.c index 7b0057dce2..dbc4fbdb9a 100644 --- a/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/setup.c +++ b/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/setup.c @@ -148,6 +148,8 @@ int nr_multicall_ents = 0; /* Raw start-of-day parameters from the hypervisor. */ union start_info_union start_info_union; +extern void (*pm_idle)(void); + static void __init limit_regions(unsigned long long size) { unsigned long long current_addr = 0; @@ -1105,6 +1107,8 @@ void __init setup_arch(char **cmdline_p) VMASST_TYPE_writeable_pagetables); #endif + pm_idle = xen_cpu_idle; + memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data)); early_cpu_init(); -- 2.30.2